Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare 3.0.0-rc.1 release #586

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Prepare 3.0.0-rc.1 release #586

merged 3 commits into from
Feb 16, 2024

Conversation

SergioGasquez
Copy link
Member

@SergioGasquez SergioGasquez commented Feb 16, 2024 •
edited
Loading

  • Bump dependencies
  • Updated and formated changelog for the rc
  • Bump espflash and cargo-espflash version to 3.0.0-rc.1
  • Bump MSRV to 1.74

Tests

I've successfully finished a round of testing, where I tested:

  • Flashing and monitoring
  • Erasing and reading flash
  • Save-image and write-bin
  • Configuration file (locally and globally)
    See details test and results bellow.

Flash/Monitoring

Used a basic esp-template for all targets and also an esp-idf-tempalte in C3 and S3

  • ESP32
    • cargo espflash flash -M
    • espflash flash -M
    • espflash monitor
  • ESP32-S2 (UART port)
    • cargo espflash flash -M
    • espflash flash -M
  • ESP32-S3 (UART, USB ports) - std and no_std app
    • cargo espflash flash -M
    • espflash flash -M
  • ESP32-C2 (26MHz and 40MHz)
    • cargo espflash flash -M
    • espflash flash -M
  • ESP32-C3 (UART, USB ports) ) - std and no_std app
    • cargo espflash flash -M
    • espflash flash -M
  • ESP32-C6 (UART, USB ports)
    • cargo espflash flash -M
    • espflash flash -M
  • ESP32-H2 (UART, USB ports)
    • cargo espflash flash -M
    • espflash flash -M

Erase/Read flash (On S3)

  • espflash read-flash 0 0x200 flash_content.bin && hexdump -C flash_content.bin
00000000  e9 04 02 20 08 99 3c 40  ee 00 00 00 09 00 00 00  |... ..<@........|
00000010  00 63 00 00 00 00 00 01  18 38 ce 3f 50 17 00 00  |.c.......8.?P...|
00000020  ff ff ff ff 1b 00 00 00  1b 00 00 00 1c 00 00 00  |................|
00000030  1c 00 00 00 28 50 04 00  f8 27 03 00 01 00 00 00  |....(P...'......|
00000040  00 f0 01 60 00 00 00 00  04 00 00 00 05 00 00 00  |...`............|
00000050  06 00 00 00 07 00 00 00  41 73 73 65 72 74 20 66  |........Assert f|
00000060  61 69 6c 65 64 20 69 6e  20 25 73 2c 20 25 73 3a  |ailed in %s, %s:|
00000070  25 64 20 28 25 73 29 0d  0a 00 61 62 6f 72 74 28  |%d (%s)...abort(|
00000080  29 20 77 61 73 20 63 61  6c 6c 65 64 20 61 74 20  |) was called at |
00000090  50 43 20 30 78 25 30 38  78 0d 0a 00 62 6f 6f 74  |PC 0x%08x...boot|
000000a0  00 1b 5b 30 3b 33 31 6d  45 20 28 25 6c 75 29 20  |..[0;31mE (%lu) |
000000b0  25 73 3a 20 6c 6f 61 64  20 70 61 72 74 69 74 69  |%s: load partiti|
000000c0  6f 6e 20 74 61 62 6c 65  20 65 72 72 6f 72 21 1b  |on table error!.|
000000d0  5b 30 6d 0a 00 20 69 73  20 6e 6f 74 20 62 6f 6f  |[0m.. is not boo|
000000e0  74 61 62 6c 65 00 1b 5b  30 3b 33 31 6d 45 20 28  |table..[0;31mE (|
000000f0  25 6c 75 29 20 25 73 3a  20 46 61 63 74 6f 72 79  |%lu) %s: Factory|
00000100  20 61 70 70 20 70 61 72  74 69 74 69 6f 6e 25 73  | app partition%s|
00000110  1b 5b 30 6d 0a 00 1b 5b  30 3b 33 31 6d 45 20 28  |.[0m...[0;31mE (|
00000120  25 6c 75 29 20 25 73 3a  20 46 61 63 74 6f 72 79  |%lu) %s: Factory|
00000130  20 74 65 73 74 20 61 70  70 20 70 61 72 74 69 74  | test app partit|
00000140  69 6f 6e 25 73 1b 5b 30  6d 0a 00 1b 5b 30 3b 33  |ion%s.[0m...[0;3|
00000150  31 6d 45 20 28 25 6c 75  29 20 25 73 3a 20 4f 54  |1mE (%lu) %s: OT|
00000160  41 20 61 70 70 20 70 61  72 74 69 74 69 6f 6e 20  |A app partition |
00000170  73 6c 6f 74 20 25 64 25  73 1b 5b 30 6d 0a 00 1b  |slot %d%s.[0m...|
00000180  5b 30 3b 33 32 6d 49 20  28 25 6c 75 29 20 25 73  |[0;32mI (%lu) %s|
00000190  3a 20 44 69 73 61 62 6c  69 6e 67 20 52 4e 47 20  |: Disabling RNG |
000001a0  65 61 72 6c 79 20 65 6e  74 72 6f 70 79 20 73 6f  |early entropy so|
000001b0  75 72 63 65 2e 2e 2e 1b  5b 30 6d 0a 00 44 52 4f  |urce....[0m..DRO|
000001c0  4d 00 1b 5b 30 3b 33 31  6d 45 20 28 25 6c 75 29  |M..[0;31mE (%lu)|
000001d0  20 25 73 3a 20 49 6d 61  67 65 20 63 6f 6e 74 61  | %s: Image conta|
000001e0  69 6e 73 20 6d 75 6c 74  69 70 6c 65 20 25 73 20  |ins multiple %s |
000001f0  73 65 67 6d 65 6e 74 73  2e 20 4f 6e 6c 79 20 74  |segments. Only t|
00000200
  • espflash erase-flash, then espflash read-flash 0 0x200 flash_content.bin && hexdump -C flash_content.bin:
❯ hexdump -C flash_content.bin
00000000  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  |................|
*
00000200

Save-image/write-bin (ESP32)

  • espflash save-image --merge --chip esp32 app.bin
  • espflash write-bin 0x0 app.bin
  • espflash monitor

Configuration file (C3)

Local config file

  • Using the following <cwd>/espflash.toml:
baudrate = 460800
bootloader = "/home/sergio/Documents/Espressif/tests/confgi6/bootloader.bin"
partition_table = "/home/sergio/Documents/Espressif/tests/confgi6/partition-table.bin"

[connection]

[[usb_device]]
vid = "303a"
pid = "1001"

And using RUST_LOG=debug cargo r, we can spot the following:

...
[2024-02-16T12:28:04Z DEBUG] Config: Config {
        baudrate: Some(
            460800,
        ),
        bootloader: Some(
            "/home/sergio/Documents/Espressif/tests/confgi6/bootloader.bin",
        ),
        connection: Connection {
            serial: None,
        },
        partition_table: Some(
            "/home/sergio/Documents/Espressif/tests/confgi6/partition-table.bin",
        ),
        usb_device: [
            UsbDevice {
                vid: 12346,
                pid: 4097,
            },
        ],
        save_path: "/home/sergio/Documents/Espressif/tests/config/espflash.toml",
    }
...
Bootloader:        /home/sergio/Documents/Espressif/tests/confgi6/bootloader.bin
Partition table:   /home/sergio/Documents/Espressif/tests/confgi6/partition-table.bin
App/part. siz
...
[2024-02-16T12:28:05Z DEBUG] Change baud to: 460800
...

Global config file

  • Using the following $HOME/.config/espflash/espflash.toml:
baudrate = 921600
bootloader = "/home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/bootloader.bin"
partition_table = "/home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/partition-table.bin"
[[usb_device]]
vid = "303a"
pid = "1001"

And using RUST_LOG=debug cargo r, we can spot the following:

...
[2024-02-16T12:33:36Z DEBUG] Config: Config {
        baudrate: Some(
            921600,
        ),
        bootloader: Some(
            "/home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/bootloader.bin",
        ),
        connection: Connection {
            serial: None,
        },
        partition_table: Some(
            "/home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/partition-table.bin",
        ),
        usb_device: [
            UsbDevice {
                vid: 12346,
                pid: 4097,
            },
        ],
        save_path: "/home/sergio/.config/espflash/espflash.toml",
    }
...
Bootloader:        /home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/bootloader.bin
Partition table:   /home/sergio/Documents/Espressif/tests/templates/std/esp32c3/target/riscv32imc-esp-espidf/debug/partition-table.bin 
...
[2024-02-16T12:33:36Z DEBUG] Change baud to: 921600
...

@SergioGasquez SergioGasquez added the skip-changelog Skips the changelog CI check label Feb 16, 2024
@SergioGasquez SergioGasquez removed the skip-changelog Skips the changelog CI check label Feb 16, 2024
@SergioGasquez SergioGasquez changed the title Prepare 3.0.0-rc.1release Prepare 3.0.0-rc.1 release Feb 16, 2024
@SergioGasquez SergioGasquez marked this pull request as ready for review February 16, 2024 12:42
MabezDev
MabezDev approved these changes Feb 16, 2024
View reviewed changes
Copy link
Member

@MabezDev MabezDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I've been using main for a while and I think we're definitely ready for an rc.

Thanks for all the hard work @SergioGasquez !

@SergioGasquez SergioGasquez merged commit 7fad99d into esp-rs:main Feb 16, 2024
20 checks passed
@SergioGasquez SergioGasquez deleted the feat/prepare-rc branch February 16, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MabezDev MabezDev MabezDev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SergioGasquez @MabezDev